diff --git a/librarian.yaml b/librarian.yaml index 7c0eb430af62..f489d54bf2dd 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -821,7 +821,6 @@ libraries: keep: - CHANGELOG.md - docs/CHANGELOG.md - skip_generate: true python: opt_args_by_api: google/cloud/biglake/hive/v1beta: diff --git a/packages/google-cloud-biglake-hive/.repo-metadata.json b/packages/google-cloud-biglake-hive/.repo-metadata.json index 9f01b457d655..a2c40f09d551 100644 --- a/packages/google-cloud-biglake-hive/.repo-metadata.json +++ b/packages/google-cloud-biglake-hive/.repo-metadata.json @@ -1,16 +1,16 @@ { - "api_description": "The BigLake API provides access to BigLake Metastore, a serverless, fully\nmanaged, and highly available metastore for open-source data that can be\nused for querying Apache Iceberg tables in BigQuery.", - "api_id": "biglake.googleapis.com", - "api_shortname": "biglake", - "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-biglake-hive/latest", - "default_version": "v1beta", - "distribution_name": "google-cloud-biglake-hive", - "issue_tracker": "https://issuetracker.google.com/issues/new?component=187149&template=1019829", - "language": "python", - "library_type": "GAPIC_AUTO", - "name": "google-cloud-biglake-hive", - "name_pretty": "BigLake API", - "product_documentation": "https://cloud.google.com/bigquery/docs/iceberg-tables#create-using-biglake-metastore", - "release_level": "preview", - "repo": "googleapis/google-cloud-python" -} + "api_description": "The BigLake API provides access to BigLake Metastore, a serverless, fully\nmanaged, and highly available metastore for open-source data that can be\nused for querying Apache Iceberg tables in BigQuery.", + "api_id": "biglake.googleapis.com", + "api_shortname": "biglake", + "client_documentation": "https://cloud.google.com/python/docs/reference/google-cloud-biglake-hive/latest", + "default_version": "v1beta", + "distribution_name": "google-cloud-biglake-hive", + "issue_tracker": "https://issuetracker.google.com/issues/new?component=187149\u0026template=1019829", + "language": "python", + "library_type": "GAPIC_AUTO", + "name": "google-cloud-biglake-hive", + "name_pretty": "BigLake API", + "product_documentation": "https://cloud.google.com/bigquery/docs/iceberg-tables#create-using-biglake-metastore", + "release_level": "preview", + "repo": "googleapis/google-cloud-python" +} \ No newline at end of file diff --git a/packages/google-cloud-biglake-hive/README.rst b/packages/google-cloud-biglake-hive/README.rst index 356dcafe3ec9..955d274c3911 100644 --- a/packages/google-cloud-biglake-hive/README.rst +++ b/packages/google-cloud-biglake-hive/README.rst @@ -63,14 +63,14 @@ Supported Python Versions Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of Python. -Python >= 3.7, including 3.14 +Python >= 3.9, including 3.14 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches Unsupported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Python <= 3.6 +Python <= 3.8 If you are using an `end-of-life`_ version of Python, we recommend that you update as soon as possible to an actively supported version. diff --git a/packages/google-cloud-biglake-hive/docs/README.rst b/packages/google-cloud-biglake-hive/docs/README.rst index 356dcafe3ec9..955d274c3911 100644 --- a/packages/google-cloud-biglake-hive/docs/README.rst +++ b/packages/google-cloud-biglake-hive/docs/README.rst @@ -63,14 +63,14 @@ Supported Python Versions Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of Python. -Python >= 3.7, including 3.14 +Python >= 3.9, including 3.14 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches Unsupported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Python <= 3.6 +Python <= 3.8 If you are using an `end-of-life`_ version of Python, we recommend that you update as soon as possible to an actively supported version. diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/async_client.py b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/async_client.py index 2c3dcb110a70..f7a2ea02fc2f 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/async_client.py +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/async_client.py @@ -210,7 +210,7 @@ def transport(self) -> HiveMetastoreServiceTransport: return self._client.transport @property - def api_endpoint(self): + def api_endpoint(self) -> str: """Return the API endpoint used by the client instance. Returns: diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/client.py b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/client.py index 02c84912fafe..f4eb3e1f5f8c 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/client.py +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/client.py @@ -127,7 +127,7 @@ class HiveMetastoreServiceClient(metaclass=HiveMetastoreServiceClientMeta): """ @staticmethod - def _get_default_mtls_endpoint(api_endpoint): + def _get_default_mtls_endpoint(api_endpoint) -> Optional[str]: """Converts api endpoint to mTLS endpoint. Convert "*.sandbox.googleapis.com" and "*.googleapis.com" to @@ -135,7 +135,7 @@ def _get_default_mtls_endpoint(api_endpoint): Args: api_endpoint (Optional[str]): the api endpoint to convert. Returns: - str: converted mTLS api endpoint. + Optional[str]: converted mTLS api endpoint. """ if not api_endpoint: return api_endpoint @@ -145,6 +145,10 @@ def _get_default_mtls_endpoint(api_endpoint): ) m = mtls_endpoint_re.match(api_endpoint) + if m is None: + # Could not parse api_endpoint; return as-is. + return api_endpoint + name, mtls, sandbox, googledomain = m.groups() if mtls or not googledomain: return api_endpoint @@ -493,7 +497,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag): @staticmethod def _get_api_endpoint( api_override, client_cert_source, universe_domain, use_mtls_endpoint - ): + ) -> str: """Return the API endpoint used by the client. Args: @@ -590,7 +594,7 @@ def _add_cred_info_for_auth_errors( error._details.append(json.dumps(cred_info)) @property - def api_endpoint(self): + def api_endpoint(self) -> str: """Return the API endpoint used by the client instance. Returns: @@ -690,7 +694,7 @@ def __init__( self._universe_domain = HiveMetastoreServiceClient._get_universe_domain( universe_domain_opt, self._universe_domain_env ) - self._api_endpoint = None # updated below, depending on `transport` + self._api_endpoint: str = "" # updated below, depending on `transport` # Initialize the universe domain validation. self._is_universe_domain_valid = False diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/README.rst b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/README.rst index 0692d3def010..b67e1685bf2f 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/README.rst +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/README.rst @@ -2,8 +2,9 @@ transport inheritance structure _______________________________ -`HiveMetastoreServiceTransport` is the ABC for all transports. -- public child `HiveMetastoreServiceGrpcTransport` for sync gRPC transport (defined in `grpc.py`). -- public child `HiveMetastoreServiceGrpcAsyncIOTransport` for async gRPC transport (defined in `grpc_asyncio.py`). -- private child `_BaseHiveMetastoreServiceRestTransport` for base REST transport with inner classes `_BaseMETHOD` (defined in `rest_base.py`). -- public child `HiveMetastoreServiceRestTransport` for sync REST transport with inner classes `METHOD` derived from the parent's corresponding `_BaseMETHOD` classes (defined in `rest.py`). +``HiveMetastoreServiceTransport`` is the ABC for all transports. + +- public child ``HiveMetastoreServiceGrpcTransport`` for sync gRPC transport (defined in ``grpc.py``). +- public child ``HiveMetastoreServiceGrpcAsyncIOTransport`` for async gRPC transport (defined in ``grpc_asyncio.py``). +- private child ``_BaseHiveMetastoreServiceRestTransport`` for base REST transport with inner classes ``_BaseMETHOD`` (defined in ``rest_base.py``). +- public child ``HiveMetastoreServiceRestTransport`` for sync REST transport with inner classes ``METHOD`` derived from the parent's corresponding ``_BaseMETHOD`` classes (defined in ``rest.py``). diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/base.py b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/base.py index c85ccc431eae..91702b1c7685 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/base.py +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/base.py @@ -84,6 +84,10 @@ def __init__( your own client library. always_use_jwt_access (Optional[bool]): Whether self signed JWT should be used for service account credentials. + api_audience (Optional[str]): The intended audience for the API calls + to the service that will be set when using certain 3rd party + authentication flows. Audience is typically a resource identifier. + If not set, the host value will be used as a default. """ # Save the scopes. @@ -133,6 +137,8 @@ def __init__( host += ":443" self._host = host + self._wrapped_methods: Dict[Callable, Callable] = {} + @property def host(self): return self._host diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc.py b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc.py index 1cfce73e1de8..5506b0c8217c 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc.py +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc.py @@ -55,7 +55,7 @@ def intercept_unary_unary(self, continuation, client_call_details, request): elif isinstance(request, google.protobuf.message.Message): request_payload = MessageToJson(request) else: - request_payload = f"{type(request).__name__}: {pickle.dumps(request)}" + request_payload = f"{type(request).__name__}: {pickle.dumps(request)!r}" request_metadata = { key: value.decode("utf-8") if isinstance(value, bytes) else value @@ -90,7 +90,7 @@ def intercept_unary_unary(self, continuation, client_call_details, request): elif isinstance(result, google.protobuf.message.Message): response_payload = MessageToJson(result) else: - response_payload = f"{type(result).__name__}: {pickle.dumps(result)}" + response_payload = f"{type(result).__name__}: {pickle.dumps(result)!r}" grpc_response = { "payload": response_payload, "metadata": metadata, @@ -198,6 +198,10 @@ def __init__( your own client library. always_use_jwt_access (Optional[bool]): Whether self signed JWT should be used for service account credentials. + api_audience (Optional[str]): The intended audience for the API calls + to the service that will be set when using certain 3rd party + authentication flows. Audience is typically a resource identifier. + If not set, the host value will be used as a default. Raises: google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc_asyncio.py b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc_asyncio.py index dd18c5cb2f3f..93285b048f64 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/grpc_asyncio.py @@ -61,7 +61,7 @@ async def intercept_unary_unary(self, continuation, client_call_details, request elif isinstance(request, google.protobuf.message.Message): request_payload = MessageToJson(request) else: - request_payload = f"{type(request).__name__}: {pickle.dumps(request)}" + request_payload = f"{type(request).__name__}: {pickle.dumps(request)!r}" request_metadata = { key: value.decode("utf-8") if isinstance(value, bytes) else value @@ -96,7 +96,7 @@ async def intercept_unary_unary(self, continuation, client_call_details, request elif isinstance(result, google.protobuf.message.Message): response_payload = MessageToJson(result) else: - response_payload = f"{type(result).__name__}: {pickle.dumps(result)}" + response_payload = f"{type(result).__name__}: {pickle.dumps(result)!r}" grpc_response = { "payload": response_payload, "metadata": metadata, @@ -249,6 +249,10 @@ def __init__( your own client library. always_use_jwt_access (Optional[bool]): Whether self signed JWT should be used for service account credentials. + api_audience (Optional[str]): The intended audience for the API calls + to the service that will be set when using certain 3rd party + authentication flows. Audience is typically a resource identifier. + If not set, the host value will be used as a default. Raises: google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport diff --git a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/rest.py b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/rest.py index 5c59ea7bc37b..ecdcb32d838f 100644 --- a/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/rest.py +++ b/packages/google-cloud-biglake-hive/google/cloud/biglake_hive_v1beta/services/hive_metastore_service/transports/rest.py @@ -1092,6 +1092,12 @@ def __init__( url_scheme: the protocol scheme for the API endpoint. Normally "https", but for testing or local servers, "http" can be specified. + interceptor (Optional[HiveMetastoreServiceRestInterceptor]): Interceptor used + to manipulate requests, request metadata, and responses. + api_audience (Optional[str]): The intended audience for the API calls + to the service that will be set when using certain 3rd party + authentication flows. Audience is typically a resource identifier. + If not set, the host value will be used as a default. """ # Run the base constructor # TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc. diff --git a/packages/google-cloud-biglake-hive/noxfile.py b/packages/google-cloud-biglake-hive/noxfile.py index 1288a3f7cd8b..2c1244dce84b 100644 --- a/packages/google-cloud-biglake-hive/noxfile.py +++ b/packages/google-cloud-biglake-hive/noxfile.py @@ -31,8 +31,6 @@ LINT_PATHS.append("samples") ALL_PYTHON = [ - "3.7", - "3.8", "3.9", "3.10", "3.11", @@ -95,8 +93,9 @@ @nox.session(python=ALL_PYTHON) def mypy(session): """Run the type checker.""" + # TODO(https://github.com/googleapis/gapic-generator-python/issues/2579): + # use the latest version of mypy session.install( - # TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy "mypy<1.16.0", "types-requests", "types-protobuf", @@ -106,6 +105,8 @@ def mypy(session): "mypy", "-p", "google", + "--check-untyped-defs", + *session.posargs, ) @@ -251,32 +252,16 @@ def install_unittest_dependencies(session, *constraints): @nox.session(python=ALL_PYTHON) @nox.parametrize( "protobuf_implementation", - ["python", "upb", "cpp"], + ["python", "upb"], ) def unit(session, protobuf_implementation): # Install all test dependencies, then install this package in-place. - # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388): - # Remove this check once support for Protobuf 3.x is dropped. - if protobuf_implementation == "cpp" and session.python in ( - "3.11", - "3.12", - "3.13", - "3.14", - ): - session.skip("cpp implementation is not supported in python 3.11+") - constraints_path = str( CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" ) install_unittest_dependencies(session, "-c", constraints_path) - # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388): - # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped. - # The 'cpp' implementation requires Protobuf<4. - if protobuf_implementation == "cpp": - session.install("protobuf<4") - # Run py.test against the unit tests. session.run( "py.test", @@ -297,7 +282,10 @@ def unit(session, protobuf_implementation): def install_systemtest_dependencies(session, *constraints): - session.install("--pre", "grpcio") + if session.python >= "3.12": + session.install("--pre", "grpcio>=1.75.1") + else: + session.install("--pre", "grpcio<=1.62.2") session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints) @@ -464,7 +452,7 @@ def docfx(session): @nox.session(python=PREVIEW_PYTHON_VERSION) @nox.parametrize( "protobuf_implementation", - ["python", "upb", "cpp"], + ["python", "upb"], ) def prerelease_deps(session, protobuf_implementation): """ @@ -474,16 +462,6 @@ def prerelease_deps(session, protobuf_implementation): `pip install --pre `. """ - # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388): - # Remove this check once support for Protobuf 3.x is dropped. - if protobuf_implementation == "cpp" and session.python in ( - "3.11", - "3.12", - "3.13", - "3.14", - ): - session.skip("cpp implementation is not supported in python 3.11+") - # Install all dependencies session.install("-e", ".") @@ -527,7 +505,7 @@ def prerelease_deps(session, protobuf_implementation): "google-api-core", "google-auth", "grpc-google-iam-v1", - "grpcio", + "grpcio>=1.75.1" if session.python >= "3.12" else "grpcio<=1.62.2", "grpcio-status", "protobuf", "proto-plus", @@ -622,7 +600,7 @@ def core_deps_from_source(session, protobuf_implementation): core_dependencies_from_source = [ "googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos", "google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core", - "google-auth @ git+https://github.com/googleapis/google-auth-library-python.git", + "google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth", "grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1", "proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus", ] diff --git a/packages/google-cloud-biglake-hive/setup.py b/packages/google-cloud-biglake-hive/setup.py index 39ba6b7911e9..3f8105c723c2 100644 --- a/packages/google-cloud-biglake-hive/setup.py +++ b/packages/google-cloud-biglake-hive/setup.py @@ -41,7 +41,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -49,7 +49,7 @@ "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", "proto-plus >= 1.22.3, <2.0.0", "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", - "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", + "protobuf >= 4.25.8, < 8.0.0", ] extras = {} url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-biglake-hive" @@ -81,8 +81,6 @@ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -94,7 +92,7 @@ ], platforms="Posix; MacOS X; Windows", packages=packages, - python_requires=">=3.7", + python_requires=">=3.9", install_requires=dependencies, extras_require=extras, include_package_data=True, diff --git a/packages/google-cloud-biglake-hive/testing/constraints-3.7.txt b/packages/google-cloud-biglake-hive/testing/constraints-3.7.txt deleted file mode 100644 index bbf88e9745ae..000000000000 --- a/packages/google-cloud-biglake-hive/testing/constraints-3.7.txt +++ /dev/null @@ -1,14 +0,0 @@ -# This constraints file is used to check that lower bounds -# are correct in setup.py -# List all library dependencies and extras in this file. -# Pin the version to the lower bound. -# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", -# Then this file should have google-cloud-foo==1.14.0 -google-api-core==1.34.1 -google-auth==2.14.1 -# cryptography is a direct dependency of google-auth -cryptography==38.0.3 -# TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) -# Add the minimum supported version of grpcio to constraints files -proto-plus==1.22.3 -protobuf==3.20.2 diff --git a/packages/google-cloud-biglake-hive/testing/constraints-3.8.txt b/packages/google-cloud-biglake-hive/testing/constraints-3.8.txt deleted file mode 100644 index 7599dea499ed..000000000000 --- a/packages/google-cloud-biglake-hive/testing/constraints-3.8.txt +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# This constraints file is required for unit tests. -# List all library dependencies and extras in this file. -google-api-core -google-auth -grpcio -proto-plus -protobuf -# cryptography is a direct dependency of google-auth -cryptography diff --git a/packages/google-cloud-biglake-hive/testing/constraints-3.9.txt b/packages/google-cloud-biglake-hive/testing/constraints-3.9.txt index 7599dea499ed..ac3833d41b9a 100644 --- a/packages/google-cloud-biglake-hive/testing/constraints-3.9.txt +++ b/packages/google-cloud-biglake-hive/testing/constraints-3.9.txt @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- -# This constraints file is required for unit tests. -# List all library dependencies and extras in this file. -google-api-core -google-auth -grpcio -proto-plus -protobuf -# cryptography is a direct dependency of google-auth -cryptography +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List all library dependencies and extras in this file, +# pinning their versions to their lower bounds. +# For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0", +# then this file should have google-cloud-foo==1.14.0 +google-api-core==2.21.0 +google-auth==2.35.0 +# TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) +# Add the minimum supported version of grpcio to constraints files +proto-plus==1.22.3 +protobuf==4.25.8 diff --git a/packages/google-cloud-biglake-hive/tests/unit/gapic/biglake_hive_v1beta/test_hive_metastore_service.py b/packages/google-cloud-biglake-hive/tests/unit/gapic/biglake_hive_v1beta/test_hive_metastore_service.py index 93338fdcfd8a..94bde6fc0d02 100644 --- a/packages/google-cloud-biglake-hive/tests/unit/gapic/biglake_hive_v1beta/test_hive_metastore_service.py +++ b/packages/google-cloud-biglake-hive/tests/unit/gapic/biglake_hive_v1beta/test_hive_metastore_service.py @@ -121,6 +121,7 @@ def test__get_default_mtls_endpoint(): sandbox_endpoint = "example.sandbox.googleapis.com" sandbox_mtls_endpoint = "example.mtls.sandbox.googleapis.com" non_googleapi = "api.example.com" + custom_endpoint = ".custom" assert HiveMetastoreServiceClient._get_default_mtls_endpoint(None) is None assert ( @@ -143,6 +144,10 @@ def test__get_default_mtls_endpoint(): HiveMetastoreServiceClient._get_default_mtls_endpoint(non_googleapi) == non_googleapi ) + assert ( + HiveMetastoreServiceClient._get_default_mtls_endpoint(custom_endpoint) + == custom_endpoint + ) def test__read_environment_variables(): @@ -1342,11 +1347,13 @@ def test_hive_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) @@ -13420,8 +13427,9 @@ def test_create_hive_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() @@ -13561,18 +13569,20 @@ def test_create_hive_catalog_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_create_hive_catalog" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_create_hive_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_create_hive_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.HiveMetastoreServiceRestInterceptor, "post_create_hive_catalog" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_create_hive_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_create_hive_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13625,8 +13635,9 @@ def test_get_hive_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() @@ -13693,18 +13704,20 @@ def test_get_hive_catalog_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_get_hive_catalog" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_get_hive_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_get_hive_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.HiveMetastoreServiceRestInterceptor, "post_get_hive_catalog" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_get_hive_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_get_hive_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13757,8 +13770,9 @@ def test_list_hive_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() @@ -13823,18 +13837,20 @@ def test_list_hive_catalogs_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_list_hive_catalogs" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_list_hive_catalogs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_list_hive_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.HiveMetastoreServiceRestInterceptor, "post_list_hive_catalogs" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_list_hive_catalogs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_list_hive_catalogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13892,8 +13908,9 @@ def test_update_hive_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() @@ -14033,18 +14050,20 @@ def test_update_hive_catalog_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_update_hive_catalog" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_update_hive_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_update_hive_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.HiveMetastoreServiceRestInterceptor, "post_update_hive_catalog" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_update_hive_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_update_hive_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14097,8 +14116,9 @@ def test_delete_hive_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() @@ -14155,13 +14175,13 @@ def test_delete_hive_catalog_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_delete_hive_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.HiveMetastoreServiceRestInterceptor, "pre_delete_hive_catalog" + ) as pre, + ): pre.assert_not_called() pb_message = hive_metastore.DeleteHiveCatalogRequest.pb( hive_metastore.DeleteHiveCatalogRequest() @@ -14206,8 +14226,9 @@ def test_create_hive_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() @@ -14347,18 +14368,20 @@ def test_create_hive_database_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_create_hive_database" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_create_hive_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_create_hive_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.HiveMetastoreServiceRestInterceptor, "post_create_hive_database" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_create_hive_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_create_hive_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14413,8 +14436,9 @@ def test_get_hive_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() @@ -14481,18 +14505,20 @@ def test_get_hive_database_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_get_hive_database" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_get_hive_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_get_hive_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.HiveMetastoreServiceRestInterceptor, "post_get_hive_database" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_get_hive_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_get_hive_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14547,8 +14573,9 @@ def test_list_hive_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() @@ -14611,18 +14638,20 @@ def test_list_hive_databases_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_list_hive_databases" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_list_hive_databases_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_list_hive_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.HiveMetastoreServiceRestInterceptor, "post_list_hive_databases" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_list_hive_databases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_list_hive_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14682,8 +14711,9 @@ def test_update_hive_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() @@ -14825,18 +14855,20 @@ def test_update_hive_database_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_update_hive_database" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_update_hive_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_update_hive_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.HiveMetastoreServiceRestInterceptor, "post_update_hive_database" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_update_hive_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_update_hive_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14891,8 +14923,9 @@ def test_delete_hive_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() @@ -14949,13 +14982,13 @@ def test_delete_hive_database_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_delete_hive_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.HiveMetastoreServiceRestInterceptor, "pre_delete_hive_database" + ) as pre, + ): pre.assert_not_called() pb_message = hive_metastore.DeleteHiveDatabaseRequest.pb( hive_metastore.DeleteHiveDatabaseRequest() @@ -15000,8 +15033,9 @@ def test_create_hive_table_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15183,18 +15217,20 @@ def test_create_hive_table_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_create_hive_table" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_create_hive_table_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_create_hive_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.HiveMetastoreServiceRestInterceptor, "post_create_hive_table" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_create_hive_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_create_hive_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15249,8 +15285,9 @@ def test_get_hive_table_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15319,18 +15356,20 @@ def test_get_hive_table_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_get_hive_table" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_get_hive_table_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_get_hive_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.HiveMetastoreServiceRestInterceptor, "post_get_hive_table" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_get_hive_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_get_hive_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15383,8 +15422,9 @@ def test_list_hive_tables_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + 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 +15487,20 @@ def test_list_hive_tables_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_list_hive_tables" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_list_hive_tables_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_list_hive_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.HiveMetastoreServiceRestInterceptor, "post_list_hive_tables" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_list_hive_tables_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_list_hive_tables" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15520,8 +15562,9 @@ def test_update_hive_table_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15707,18 +15750,20 @@ def test_update_hive_table_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_update_hive_table" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_update_hive_table_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_update_hive_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.HiveMetastoreServiceRestInterceptor, "post_update_hive_table" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_update_hive_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_update_hive_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15773,8 +15818,9 @@ def test_delete_hive_table_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15833,13 +15879,13 @@ def test_delete_hive_table_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_delete_hive_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.HiveMetastoreServiceRestInterceptor, "pre_delete_hive_table" + ) as pre, + ): pre.assert_not_called() pb_message = hive_metastore.DeleteHiveTableRequest.pb( hive_metastore.DeleteHiveTableRequest() @@ -15886,8 +15932,9 @@ def test_batch_create_partitions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15949,18 +15996,22 @@ def test_batch_create_partitions_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_batch_create_partitions" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_batch_create_partitions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_batch_create_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.HiveMetastoreServiceRestInterceptor, + "post_batch_create_partitions", + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_batch_create_partitions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "pre_batch_create_partitions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16020,8 +16071,9 @@ def test_batch_delete_partitions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16080,13 +16132,14 @@ def test_batch_delete_partitions_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_batch_delete_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.HiveMetastoreServiceRestInterceptor, + "pre_batch_delete_partitions", + ) as pre, + ): pre.assert_not_called() pb_message = hive_metastore.BatchDeletePartitionsRequest.pb( hive_metastore.BatchDeletePartitionsRequest() @@ -16133,8 +16186,9 @@ def test_batch_update_partitions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16196,18 +16250,22 @@ def test_batch_update_partitions_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_batch_update_partitions" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_batch_update_partitions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "pre_batch_update_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.HiveMetastoreServiceRestInterceptor, + "post_batch_update_partitions", + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_batch_update_partitions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "pre_batch_update_partitions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16267,8 +16325,9 @@ def test_list_partitions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16334,18 +16393,20 @@ def test_list_partitions_rest_interceptors(null_interceptor): ) client = HiveMetastoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "post_list_partitions" - ) as post, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, - "post_list_partitions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HiveMetastoreServiceRestInterceptor, "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.HiveMetastoreServiceRestInterceptor, "post_list_partitions" + ) as post, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, + "post_list_partitions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HiveMetastoreServiceRestInterceptor, "pre_list_partitions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16880,11 +16941,14 @@ def test_hive_metastore_service_base_transport(): def test_hive_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.biglake_hive_v1beta.services.hive_metastore_service.transports.HiveMetastoreServiceTransport._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_hive_v1beta.services.hive_metastore_service.transports.HiveMetastoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HiveMetastoreServiceTransport( @@ -16904,9 +16968,12 @@ def test_hive_metastore_service_base_transport_with_credentials_file(): def test_hive_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.biglake_hive_v1beta.services.hive_metastore_service.transports.HiveMetastoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.biglake_hive_v1beta.services.hive_metastore_service.transports.HiveMetastoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HiveMetastoreServiceTransport() @@ -16984,11 +17051,12 @@ def test_hive_metastore_service_transport_auth_gdch_credentials(transport_class) def test_hive_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"])