Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
aedbee9
feat: apply PEP 0810 lazy imports to google-cloud-compute
hebaalazzeh Jun 30, 2026
4b3ba9d
fix: remove python version guard for PEP 810 lazy imports
hebaalazzeh Jun 30, 2026
c60e977
feat: centralize service-agnostic boilerplate into api_core for GAPIC…
hebaalazzeh Jul 6, 2026
4463094
Update packages/google-api-core/google/api_core/gapic_v1/client_helpe…
hebaalazzeh Jul 6, 2026
4d9bea2
refactor: optimize regex and update type hints in client_helpers
hebaalazzeh Jul 6, 2026
54cf6a0
style: run black formatter on client_helpers.py
hebaalazzeh Jul 6, 2026
69260e5
fix: address lint and mypy issues in api_core and kms
hebaalazzeh Jul 6, 2026
46e0797
fix: address black formatting issue in client_helpers.py
hebaalazzeh Jul 6, 2026
a4513c4
fix: add underscore prefix to internal helpers in client_helpers.py
hebaalazzeh Jul 6, 2026
ad1c01f
test: add unit tests for gapic client_helpers
hebaalazzeh Jul 6, 2026
1456ead
chore: revert experimental kms validation changes
hebaalazzeh Jul 6, 2026
0ffcdd3
fix: resolve flake8 line length issues in tests
hebaalazzeh Jul 6, 2026
2168bc0
chore: revert experimental PEP 0810 lazy loading in compute
hebaalazzeh Jul 6, 2026
5abeb85
feat: centralize additional client helpers to api_core
hebaalazzeh Jul 6, 2026
09243e9
test: mock missing google-auth mtls attributes
hebaalazzeh Jul 6, 2026
be2b472
style: remove manual 79-char line breaks to satisfy black
hebaalazzeh Jul 6, 2026
d386dfe
refactor: remove underscore prefix from gapic client helpers
hebaalazzeh Jul 7, 2026
72d6561
fix: linting issues and add backward compatibility aliases for intern…
hebaalazzeh Jul 7, 2026
6a44282
fix: skip test_client_helpers in non-grpc environments
hebaalazzeh Jul 7, 2026
2353e82
fix: mock patch missing attribute in old google-auth versions
hebaalazzeh Jul 7, 2026
7208833
feat: split client_helpers into domain-specific modules
hebaalazzeh Jul 9, 2026
65861d9
chore: fix lint and formatting
hebaalazzeh Jul 10, 2026
17acb05
chore: revert accidental formatting and generated files to fix dedupl…
hebaalazzeh Jul 10, 2026
3e9393a
test: split test_client_helpers.py into domain-specific test files
hebaalazzeh Jul 10, 2026
1888b2e
fix: address reviewer comments on api-core
hebaalazzeh Jul 10, 2026
9a36216
test: restore grpc skip to test_method_helpers
hebaalazzeh Jul 13, 2026
f1ca030
fix: safely handle None in get_api_endpoint default_endpoint_template
hebaalazzeh Jul 13, 2026
68f5263
chore: revert unrelated bigframes changes
hebaalazzeh Jul 13, 2026
018d107
fix: make grpc-dependent imports conditional in gapic_v1/__init__.py …
hebaalazzeh Jul 13, 2026
f286631
chore: fix black formatting in gapic_v1/__init__.py
hebaalazzeh Jul 13, 2026
b830151
fix: add noqa flags to unused conditional imports and remove unused p…
hebaalazzeh Jul 13, 2026
a175e88
chore: trigger CI to retry flaky bigframes test
hebaalazzeh Jul 13, 2026
575244e
chore: revert unrelated changes to bigframes, bigquery, and pandas-gbq
hebaalazzeh Jul 13, 2026
a1341f0
fix: isolate unit tests from workstation mTLS environments and fix co…
hebaalazzeh Jul 13, 2026
dcce1e7
test: resolve timing flake in test_bidi.py by adding tolerance to wai…
hebaalazzeh Jul 13, 2026
e0f3f85
merge: merge origin/main into feat/gapic-centralization-api-core
hebaalazzeh Jul 13, 2026
b8a3b32
Update packages/google-api-core/tests/unit/gapic/test_routing.py
hebaalazzeh Jul 14, 2026
317c7ec
Update packages/google-api-core/google/api_core/gapic_v1/_method_help…
hebaalazzeh Jul 14, 2026
b4b9450
Update packages/google-api-core/google/api_core/gapic_v1/_routing.py
hebaalazzeh Jul 14, 2026
b4fe2d0
Update packages/google-api-core/tests/unit/gapic/test_client_cert.py
hebaalazzeh Jul 14, 2026
5471865
Update packages/google-api-core/tests/unit/gapic/test_config_helpers.py
hebaalazzeh Jul 14, 2026
ed6438e
Update packages/google-api-core/google/api_core/gapic_v1/_routing.py
hebaalazzeh Jul 14, 2026
393fd85
fix: address code review feedback for GAPIC centralization
hebaalazzeh Jul 14, 2026
2fae23a
fix: add grpc check back to test modules to prevent ImportError on no…
hebaalazzeh Jul 14, 2026
70445ef
style: run black formatter on gapic test files
hebaalazzeh Jul 14, 2026
2cdabf9
Merge branch 'main' into feat/gapic-centralization-api-core
hebaalazzeh Jul 15, 2026
6bf0e26
fix(gapic): resolve linting errors from redundant eager imports
hebaalazzeh Jul 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# -*- coding: utf-8 -*-
# Copyright 2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

"""Helpers for client certificate handling and mTLS authentication."""

import os
from typing import Callable, Optional, Tuple

from google.auth.transport import mtls # type: ignore


def _use_client_cert_effective() -> bool:
"""Returns whether client certificate should be used for mTLS if the
google-auth version supports should_use_client_cert automatic mTLS
enablement.
Alternatively, read from the GOOGLE_API_USE_CLIENT_CERTIFICATE env var.
Returns:
bool: whether client certificate should be used for mTLS
Raises:
ValueError: (If using a version of google-auth without
should_use_client_cert and GOOGLE_API_USE_CLIENT_CERTIFICATE is
set to an unexpected value.)
"""
# check if google-auth version supports should_use_client_cert for
# automatic mTLS enablement
if hasattr(mtls, "should_use_client_cert"): # pragma: NO COVER
return mtls.should_use_client_cert()
else: # pragma: NO COVER
# if unsupported, fallback to reading from env var
use_client_cert_str = os.getenv(
"GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
).lower()
if use_client_cert_str not in ("true", "false"):
raise ValueError(
"Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` "
"must be either `true` or `false`"
)
return use_client_cert_str == "true"


def _get_client_cert_source(
provided_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]],
use_cert_flag: bool,
) -> Optional[Callable[[], Tuple[bytes, bytes]]]:
"""Return the client cert source to be used by the client.
Args:
provided_cert_source (Callable[[], Tuple[bytes, bytes]]): The client certificate source provided.
use_cert_flag (bool): A flag indicating whether to use the
client certificate.
Returns:
Callable[[], Tuple[bytes, bytes]] or None: The client cert source to be used by the client.
"""
client_cert_source = None
if use_cert_flag:
if provided_cert_source:
client_cert_source = provided_cert_source
elif (
hasattr(mtls, "has_default_client_cert_source")
and mtls.has_default_client_cert_source()
):
client_cert_source = mtls.default_client_cert_source()
return client_cert_source
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# -*- coding: utf-8 -*-
# Copyright 2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

"""Helpers for parsing environment variables."""

import os
from typing import Optional, Tuple

from google.auth.exceptions import MutualTLSChannelError # type: ignore

from google.api_core.gapic_v1._client_cert import _use_client_cert_effective


def _read_environment_variables() -> Tuple[bool, str, Optional[str]]:
"""Returns the environment variables used by the client.

Returns:
Tuple[bool, str, Optional[str]]: returns the
GOOGLE_API_USE_CLIENT_CERTIFICATE, GOOGLE_API_USE_MTLS_ENDPOINT,
and GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variables.

Raises:
ValueError: If GOOGLE_API_USE_CLIENT_CERTIFICATE is not
any of ["true", "false"].
google.auth.exceptions.MutualTLSChannelError: If
GOOGLE_API_USE_MTLS_ENDPOINT is not any of
["auto", "never", "always"].
"""
use_client_cert = _use_client_cert_effective()
use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto").lower()
universe_domain_env = os.getenv("GOOGLE_CLOUD_UNIVERSE_DOMAIN")
if use_mtls_endpoint not in ("auto", "never", "always"):
raise MutualTLSChannelError(
"Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` "
"must be `never`, `auto` or `always`"
)
return use_client_cert, use_mtls_endpoint, universe_domain_env
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# -*- coding: utf-8 -*-
# Copyright 2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

"""Helpers for method requests."""

import uuid
from typing import Any


def _setup_request_id(request: Any, field_name: str, is_proto3_optional: bool) -> None:
"""Populate a UUID4 field in the request if it is not already set.
Args:
request (Union[google.protobuf.message.Message, dict]): The
request object.
field_name (str): The name of the field to populate.
is_proto3_optional (bool): Whether the field is proto3 optional.
"""
if isinstance(request, dict):
if is_proto3_optional:
if field_name not in request:
request[field_name] = str(uuid.uuid4())
elif not request.get(field_name):
request[field_name] = str(uuid.uuid4())
return

if is_proto3_optional:
try:
# Pure protobuf messages
if not request.HasField(field_name):
setattr(request, field_name, str(uuid.uuid4()))
except (AttributeError, ValueError):
# Proto-plus messages or other objects
if not getattr(request, field_name, None):
setattr(request, field_name, str(uuid.uuid4()))
else:
if not getattr(request, field_name):
setattr(request, field_name, str(uuid.uuid4()))
101 changes: 101 additions & 0 deletions packages/google-api-core/google/api_core/gapic_v1/_routing.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# -*- coding: utf-8 -*-
# Copyright 2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

"""Helpers for routing and endpoint resolution."""

import re
from typing import Any, Optional

from google.auth.exceptions import MutualTLSChannelError # type: ignore

_MTLS_ENDPOINT_RE = re.compile(
r"(?P<name>[^.]+)(?P<mtls>\.mtls)?(?P<sandbox>\.sandbox)?"
r"(?P<googledomain>\.googleapis\.com)?"
)


def _get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
"""Converts api endpoint to mTLS endpoint.
Convert "*.sandbox.googleapis.com" and "*.googleapis.com" to
"*.mtls.sandbox.googleapis.com" and "*.mtls.googleapis.com" respectively.
Args:
api_endpoint (Optional[str]): the api endpoint to convert.
Returns:
Optional[str]: converted mTLS api endpoint.
"""
if not api_endpoint:
return 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_group, sandbox, googledomain = m.groups()
if mtls_group or not googledomain:
return api_endpoint

if sandbox:
return api_endpoint.replace(
"sandbox.googleapis.com", "mtls.sandbox.googleapis.com"
)

return api_endpoint.replace(".googleapis.com", ".mtls.googleapis.com")


def _get_api_endpoint(
api_override: Optional[str],
client_cert_source: Optional[Any],
universe_domain: str,
use_mtls_endpoint: str,
default_universe: str,
default_mtls_endpoint: Optional[str],
default_endpoint_template: Optional[str],
) -> Optional[str]:
"""Return the API endpoint used by the client."""
if api_override is not None:
return api_override
elif use_mtls_endpoint == "always" or (
use_mtls_endpoint == "auto" and client_cert_source
):
if universe_domain.lower() != default_universe.lower():
raise MutualTLSChannelError(
f"mTLS is not supported in any universe other than {default_universe}."
)
return default_mtls_endpoint
else:
return (
default_endpoint_template.format(UNIVERSE_DOMAIN=universe_domain)
if default_endpoint_template
else None
)


def _get_universe_domain(
client_universe_domain: Optional[str],
universe_domain_env: Optional[str],
default_universe: str,
) -> str:
"""Return the universe domain used by the client."""
universe_domain = default_universe
if client_universe_domain is not None:
universe_domain = client_universe_domain.strip()
elif universe_domain_env is not None:
universe_domain = universe_domain_env.strip()
if not universe_domain:
raise ValueError("Universe Domain cannot be an empty string.")
return universe_domain
2 changes: 1 addition & 1 deletion packages/google-api-core/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ def prerelease_deps(session):
@nox.session(python=DEFAULT_PYTHON_VERSION)
def core_deps_from_source(session):
"""Run the test suite installing dependencies from source."""
default(session, prerelease=True)
default(session, install_deps_from_source=True)


@nox.session(python=DEFAULT_PYTHON_VERSION)
Expand Down
31 changes: 31 additions & 0 deletions packages/google-api-core/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# -*- coding: utf-8 -*-
# Copyright 2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os
from unittest import mock
import pytest


@pytest.fixture(scope="session", autouse=True)
def mock_mtls_env():
"""Autouse session-scoped fixture to isolate unit tests from workstation mTLS environments."""
with mock.patch.dict(
os.environ,
{
"GOOGLE_API_USE_CLIENT_CERTIFICATE": "false",
"CLOUDSDK_CONTEXT_AWARE_USE_CLIENT_CERTIFICATE": "false",
},
):
yield
Loading
Loading