chore(generator): use routing helper from api_core in templates - #17746
Closed
hebaalazzeh wants to merge 1 commit into
Closed
chore(generator): use routing helper from api_core in templates #17746hebaalazzeh wants to merge 1 commit into
hebaalazzeh wants to merge 1 commit into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
hebaalazzeh
changed the base branch from
main
to
feat/gapic-centralization-api-core-routing
July 16, 2026 19:19
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the client service templates by delegating endpoint and universe domain logic to the google.api_core.gapic_v1.routing module, which also allowed for the removal of redundant unit tests. The reviewer recommended adding type hints to the _get_default_mtls_endpoint and _get_api_endpoint methods to ensure code clarity following the removal of detailed docstrings.
Sorry, something went wrong.
Comment thread
...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
Outdated
Comment thread
...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
Outdated
hebaalazzeh
force-pushed
the
feat/gapic-centralization-api-core-routing
branch
from
3e2d8e2 to
0fe63b5
Compare
July 16, 2026 20:00
hebaalazzeh
force-pushed
the
feat/gapic-generator-centralization-routing
branch
2 times, most recently
from
48f392a to
05fb32e
Compare
July 16, 2026 20:13
daniel-sanche
requested changes
Jul 16, 2026
Comment thread
...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
Outdated
Comment thread
...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
Outdated
hebaalazzeh
force-pushed
the
feat/gapic-centralization-api-core-routing
branch
4 times, most recently
from
85cd706 to
8816dfe
Compare
July 21, 2026 01:25
hebaalazzeh
force-pushed
the
feat/gapic-centralization-api-core-routing
branch
from
d435c6c to
016d00e
Compare
July 21, 2026 16:18
hebaalazzeh
force-pushed
the
feat/gapic-generator-centralization-routing
branch
from
00f5e2d to
6ae7468
Compare
July 21, 2026 16:30
daniel-sanche
requested changes
Jul 21, 2026
Comment thread
...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
| {{ service.client_name }}._DEFAULT_UNIVERSE, | ||
| {{ service.client_name }}.DEFAULT_MTLS_ENDPOINT, | ||
| {{ service.client_name }}._DEFAULT_ENDPOINT_TEMPLATE, | ||
| ) |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
shouldn't this be moved to _compat with the others?
Sorry, something went wrong.
Comment thread
...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
| client_universe_domain, | ||
| universe_domain_env, | ||
| {{ service.client_name }}._DEFAULT_UNIVERSE, | ||
| ) |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
- shouldn't this also be moved to _compat?
- can we import it from api_core.universe, instead of doing this aliased import?
Sorry, something went wrong.
Comment thread
...ges/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
|
|
||
| with pytest.raises(MutualTLSChannelError) as excinfo: | ||
| {{ service.client_name }}._get_api_endpoint(None, mock_client_cert_source, mock_universe, "auto") | ||
| assert str(excinfo.value) == "mTLS is not supported in any universe other than googleapis.com." |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Were these tests carried over? (I don't see get_api_endpoint in the linked PR: #17745
Sorry, something went wrong.
Comment thread
...integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py
| return api_endpoint.replace(".googleapis.com", ".mtls.googleapis.com") | ||
| def _get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]: | ||
| """Converts api endpoint to mTLS endpoint.""" | ||
| return client_utils.get_default_mtls_endpoint(api_endpoint) |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
I thought the function was being removed?
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
Assignees
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updates generator templates and goldens to import public routing helpers from google-api-core gapic_v1 and delegate API endpoint, mTLS, and universe domain resolution methods to it.
Removes duplicate routing unit tests from the generated client unit tests (as they are now fully tested in google-api-core).
Associated / Dependent API Core PR: chore(api-core): move universe and endpoint routing logic to gapic_v1 public helpers(#17745)